Autogenerated HTML docs for v1.5.0-50-gb7581
diff --git a/git-checkout.html b/git-checkout.html index 14b659e..843465c 100644 --- a/git-checkout.html +++ b/git-checkout.html
@@ -347,7 +347,8 @@ </p> <p>When a merge conflict happens, the index entries for conflicting paths are left unmerged, and you need to resolve the conflicts -and mark the resolved paths with <tt>git update-index</tt>.</p> +and mark the resolved paths with <tt>git add</tt> (or <tt>git rm</tt> if the merge +should result in deletion of the path).</p> </dd> <dt> <new_branch> @@ -487,11 +488,11 @@ <p>At this point, <tt>git diff</tt> shows the changes cleanly merged as in the previous example, as well as the changes in the conflicted files. Edit and resolve the conflict and mark it resolved with -<tt>git update-index</tt> as usual:</p> +<tt>git add</tt> as usual:</p> <div class="listingblock"> <div class="content"> <pre><tt>$ edit frotz -$ git update-index frotz</tt></pre> +$ git add frotz</tt></pre> </div></div> </li> </ol> @@ -510,7 +511,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 13-Feb-2007 23:48:05 UTC +Last updated 18-Feb-2007 00:34:40 UTC </div> </div> </body>
